Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config refactor #2297

Merged
Merged

Conversation

AsparagusEduardo
Copy link
Collaborator

Description

  • Refactored uses of configs to be exclusivetly handled by preproc, as an optimization such that we don't have stuff like (is 3 > 4?)
  • Moved Gen definitions to include/config.h, to be used by all config files.
  • Created GEN_LATEST as a way to avoid conflicts with users that modify the default configs and have a way for them to easily set everything to their prefered generation.

Discord contact info

AsparagusEduardo#6051

# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
…figs

# Conflicts:
#	src/battle_script_commands.c
ghoulslash
ghoulslash previously approved these changes Sep 6, 2022
@ghoulslash
Copy link
Collaborator

looks good. just need to solve conflicts

…factor

# Conflicts:
#	include/constants/battle_config.h
@AsparagusEduardo
Copy link
Collaborator Author

Conflicts resolved, ready to merge.

@ghoulslash ghoulslash merged commit d33e4b0 into rh-hideout:master Sep 6, 2022
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/configRefactor branch September 6, 2022 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants